Skip to content

Audio refactor#55

Merged
tig888 merged 6 commits into
mainfrom
jpc/audio-refactor
May 31, 2026
Merged

Audio refactor#55
tig888 merged 6 commits into
mainfrom
jpc/audio-refactor

Conversation

@jpc

@jpc jpc commented Apr 1, 2026

Copy link
Copy Markdown
Member

Focus:

  • consistent handling of torchaudio and humecodec (torchcodec does not seem to bring anything here)
  • accurate fast seeking in AAC and MP3 (99,99% of our data) and correct slow fallback for everything else
  • tests for both of the above

@jpc jpc force-pushed the jpc/audio-refactor branch 3 times, most recently from bead1d3 to b5cbbc8 Compare April 14, 2026 08:45
jpc and others added 6 commits May 17, 2026 01:18
- Use start_skip_samples from demuxer for seek adjustment (mp3 encoder
  delay, MP4 edit lists). The demuxer applies this skip at pts=0 but not
  after seeking.
- Read codec_delay from decoder's output stream info for codecs where
  the delay is set by the codec init (wmav2, opus).
- Switch read loop to PTS-based termination instead of sample counting,
  fixing truncation when seek lands far from target.
- Detect when seek lands at stream start (chunk0.pts < margin) and use
  tstart=0 timeline to match ffmpeg CLI behavior.
- Handle negative first-chunk PTS (some AAC files) by clamping to 0.

Test results: 100/100 full load, 93/100 seek (±5 sample tolerance).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- For short seeks (tstart < 5s) and unreliable codecs (wmav2/wmapro),
  always read from the start instead of seeking. This avoids the
  seek_landed_at_start heuristic entirely for short seeks and costs
  almost nothing for small files.
- Only apply start_skip_samples seek_adj when actually seeking, not
  when reading from start (where the decoder handles it automatically).
- Initialize seek_adj to 0.0 to avoid UnboundLocalError.

Comprehensive test: 1494/1580 pass (94.6%), up from ~85% before.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Build a packet index (128KB resolution) on first seek and use
seek_to_byte_offset for raw MPEG audio formats. This avoids the
slow sequential scan that ffmpeg's mp3 demuxer does for timestamp
seeks. The index PTS is used directly for trimming since the demuxer
doesn't update PTS after byte seek.

Also: no seek_adj for indexed seeks (index PTS is in raw timeline,
not the skip_samples-adjusted timeline).

Comprehensive test: 1556/1580 pass (98.5%) across 8 seek positions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@jpc jpc force-pushed the jpc/audio-refactor branch from b5cbbc8 to 7be4020 Compare May 17, 2026 18:57
@jpc jpc changed the base branch from jpc/wssink-improvements to main May 18, 2026 18:27
@tig888 tig888 self-requested a review May 31, 2026 20:32

@tig888 tig888 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested, works ok

@tig888 tig888 marked this pull request as ready for review May 31, 2026 20:43
@tig888 tig888 merged commit 159008b into main May 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants